From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 11 Jun 2012 16:53:12 +0000 (+0200)
Subject: * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~941^2~89
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=50a938632dec4c07247a3179781219651bab9002;p=emacs.git

* nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
referenced.

Fixes: debbugs:11583
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 08e1c7dbd73..838703578c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
+	referenced (Bug#11583).
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
 	* Version 24.1 released.
diff --git a/src/nsterm.m b/src/nsterm.m
index 7cbaf991311..aad1f3283d6 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1158,14 +1158,14 @@ x_free_frame_resources (struct frame *f)
       hlinfo->mouse_face_mouse_frame = 0;
     }
 
-  xfree (f->output_data.ns);
-
   if (f->output_data.ns->miniimage != nil)
     [f->output_data.ns->miniimage release];
 
   [[view window] close];
   [view release];
 
+  xfree (f->output_data.ns);
+
   UNBLOCK_INPUT;
 }